x11: Stop using gdk_surface_raise
authorMatthias Clasen <mclasen@redhat.com>
Sat, 29 Feb 2020 17:54:24 +0000 (12:54 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 11 Mar 2020 23:35:56 +0000 (19:35 -0400)
Avoid a vfunc roundtrip and just use the backend
implementation directly.

gdk/x11/gdkdrag-x11.c
gdk/x11/gdkprivate-x11.h
gdk/x11/gdksurface-x11.c

index cbf5b75d06ca02d0972af2b78677defc7fa1248e..8ac9bd782b1300fa99cbc9d38ca920b43617bee7 100644 (file)
@@ -1399,7 +1399,7 @@ move_drag_surface (GdkDrag *drag,
   gdk_x11_surface_move (drag_x11->drag_surface,
                         x_root - drag_x11->hot_x,
                         y_root - drag_x11->hot_y);
-  gdk_surface_raise (drag_x11->drag_surface);
+  gdk_x11_surface_raise (drag_x11->drag_surface);
 }
 
 static gboolean
index 36cdea1d1cacd231e704b5d9c78c2611483d1c2e..d1b5e4c3e3ced17ffd371eab1fee214af3f78ce4 100644 (file)
@@ -230,6 +230,8 @@ void gdk_x11_surface_get_root_coords (GdkSurface *surface,
                                       gint       *root_x,
                                       gint       *root_y);
 
+void gdk_x11_surface_raise (GdkSurface *surface);
+
 GdkGrabStatus _gdk_x11_convert_grab_status (gint status);
 
 cairo_surface_t * _gdk_x11_display_create_bitmap_surface (GdkDisplay *display,
index dfb186d336bd079267c6fa789d55c526d6598482..bed745b8f5531a5d4e3fe7a997bacb003a021ea5 100644 (file)
@@ -1455,7 +1455,7 @@ gdk_x11_surface_layout_popup (GdkSurface     *surface,
 static void
 show_popup (GdkSurface *surface)
 {
-  gdk_surface_raise (surface);
+  gdk_x11_surface_raise (surface);
   gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
   _gdk_surface_update_viewable (surface);
   gdk_x11_surface_show (surface, FALSE);
@@ -1561,7 +1561,7 @@ _gdk_x11_surface_set_surface_scale (GdkSurface *surface,
   gdk_surface_invalidate_rect (surface, NULL);
 }
 
-static void
+void
 gdk_x11_surface_raise (GdkSurface *surface)
 {
   XRaiseWindow (GDK_SURFACE_XDISPLAY (surface), GDK_SURFACE_XID (surface));